Merge tag 'upstream/1.8.0'
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Mon, 15 Aug 2016 13:57:01 +0000 (15:57 +0200)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Mon, 15 Aug 2016 13:57:01 +0000 (15:57 +0200)
commite3971f0a2d18800e6b080d54362be0db9cc2349f
tree2c33bfd6476f8b85151df4eb6e175590d49fed93
parent0cebca393f60f67047770cb82b07dfa333887669
parentcff328462e82392bce32c3c549a259a22c105ae6
Merge tag 'upstream/1.8.0'

Upstream version 1.8.0